From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 12 Jun 1993 17:10:13 +0000 (+0000)
Subject: (echo_area_display): Use XFASTINT on ->height.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95371
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b2a7698263036b1986825065baa36c8ae5aabcbd;p=emacs.git

(echo_area_display): Use XFASTINT on ->height.
(copy_rope, copy_part_of_rope): Access *f as Lisp_Object.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 3acdaed0740..62a029c818d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -332,7 +332,8 @@ echo_area_display ()
       {
 	int i;
 
-	for (i = vpos + 1; i < vpos + XWINDOW (minibuf_window)->height; i++)
+	for (i = vpos + 1;
+	     i < vpos + XFASTINT (XWINDOW (minibuf_window)->height); i++)
 	  {
 	    get_display_line (f, i, 0);
 	    display_string (XWINDOW (minibuf_window), vpos,
@@ -1599,9 +1600,11 @@ copy_rope (t, s, from, face)
 
   while (n--)
     {
-      if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (*f),
-				   (GLYPH_FACE (*f)
-				    ? GLYPH_FACE (*f)
+      int glyph = XFASTINT (*f);
+
+      if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (glyph),
+				   (GLYPH_FACE (glyph)
+				    ? GLYPH_FACE (glyph)
 				    : face));
       ++t;
       ++f;
@@ -1625,9 +1628,11 @@ copy_part_of_rope (t, s, from, len, face)
 
   while (n--)
     {
-      if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (*f),
-				   (GLYPH_FACE (*f)
-				    ? GLYPH_FACE (*f)
+      int glyph = XFASTINT (*f);
+
+      if (t >= s) *t = MAKE_GLYPH (GLYPH_CHAR (glyph),
+				   (GLYPH_FACE (glyph)
+				    ? GLYPH_FACE (glyph)
 				    : face));
       ++t;
       ++f;